Add ability to include SIMEX in SGP CONFIG
Add analytic geom knots and cuts.  Fix calculate.simex.baseline default
Change calculate.simex args to sgp.iter
Correct sgp.iter indexing
Merge pull request #681 from adamvi/master

 Add ability to include SIMEX in SGP CONFIG
Update to Adams branch