Merge pull request #27 from kraman/build-images

Changes to command line structure
WIP