Add padding and margin options to the cli interface
Merge branch 'master' of https://github.com/miguelgonz/sprite-factory into 1.6.0