Updating version numbers.
Updating some of the options handling code to use underscore for the type checking.  Also cleaning up some of that code to make it more consistent.