Regexp multiline matches optional carriage return

So it works on Windows.
Merge branch 'master' of github.com:boot2docker/boot2docker-cli
Bugfix: make VMDK image didn't work on Windows
Bugfix: delete VM from more possible states