Add .vagrant to gitignore
Commit vagrant file stuff
Merge branch 'master' of https://github.com/MikeyBurkman/dchousing-apps

Conflicts:
	.gitignore