Add cpphs to build-tools

Using cpphs improves compatibility with
non-GNU toolchains (e.g. clang presently
chokes on some headers accepted by GNU cpp,
which can be an issue for people running OS X).
Merge branches 'new-upstream' and 'cpphs' into dev