Merging a squash of the branch timothy-king/CVC4/glpknecfix c95bf7d4f1 i...

This includes the previous pull request as well as a fix the previous build failures.