Revert "Sorry, I didn't test the effects of merging 2 PRs"

Reverts boot2docker/boot2docker-cli#196


I'm backing out the driver refactor master for 1.1.2 - see https://github.com/boot2docker/boot2docker-cli/tree/new-driver-model