Fixed bug with alt. options
Resolved conflicts

Merge branch 'v1.0' of https://github.com/gforge/Greg into v1.0

Conflicts:
	R/printCrudeAndAdjustedModel.R