formatting and command line options
Merge branch 'master' of github.com:mckoss/labs