Merge pull request #101 from dangowrt/update-cjdns-for-15.05