Fix make install

This pull request contains all the work from my galbreath2/compiletests-rc branch, as well as fixes to make install & merge conflicts.