String formatting of usage doc
Merge branch 'master' of github.com:ceholden/misc