ignore .vagrant file
Merge branch 'master' of github.com:davehubler/locke

Conflicts:
	.gitignore
	db/schema.rb