Deal with synced folders
Merge branch 'master' of github.com:jamlen/devenv

Conflicts:
	Vagrantfile