build system fixes
Merge branch 'develop' of https://github.com/xnova/counterpartyd_build into develop