Redo options / add cli

Merge after https://github.com/modcloth/docker-builder/pull/43