Initial vagrant commit
Add .vagrant folders
Merge remote-tracking branch 'origin/vagrant'

Conflicts:
	.gitignore