more CLI bugfixes.
Merge pull request #40 from zimmerst/deploy-v1r1p5

more CLI bugfixes.