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

Conflicts:
	vmx
spaces
Merge remote-tracking branch 'origin/boot2docker' into dockerfiles

Conflicts:
	vmx