Tweaks to makefiles mostly

This commit was done after the merge of hdf to github.
Merge https://github.com/ihutch/sceptic