Various changes to help text and option wording
Merge pull request #5 from danlurie/master

Weekend changes.