Merging in the glpk changes

Merging a squash of the branch timothy-king/CVC4/glpknecfix c95bf7d4f1. This now brings in new changes from trunk and bug fixes.