Update option parser somewhat.
Merge README changes.