Merge pull request #361 from akru/cjdns-build-fixes