silshack/fall2013 — pull request #385 by gillenme (2013-10-16 12:22:56+00:00)
Title: Merge Mary's command line post 

This isn't ready to merge yet! I still have part 2 to do. :)