first crack at using Vagrant to set up a dev box
Merge remote-tracking branch 'origin/master' into dev

Conflicts:
	.gitignore