better perm checking
catch other exit codes
Merge remote-tracking branch 'origin' into boot2docker

Conflicts:
	vmx