Changes to command line structure
Reorg of code in main function to match new arguments
Merge pull request #27 from kraman/build-images

Changes to command line structure