Merging in additional glpk options and statistics from CAV submission.
Merge remote-tracking branch 'timothy-king/master'