Fixed short options.  Minor code cleanup.
Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev