boot2docker support
boot2docker test
Merge remote-tracking branch 'origin' into boot2docker

Conflicts:
	vmx
spaces
Merge pull request #4 from VISIONAI/boot2docker

Boot2docker