tidies up
Merge branch 'master' of github.com:Morriz/vagrant-docker

Conflicts:
	README.md