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 branch 'build-tools' into cpphs

Conflicts:
	ncursesw/ncursesw.cabal
Update pointers to upstream
Merge branches 'new-upstream' and 'build-tools' into dev
Merge branches 'curses' and 'cpphs' into dev