Option flag rework

split out from another pull request in prep for implementing the "-W" flag.
Changes per feedback
Merge pull request #476 from modcloth/mbh/main-flag-rework

Option flag rework