Fix CLI regressions

A few loose ends in the https://github.com/docker/machine/pull/72 new shiny