WIP
Updated gemfile, edited Vagrantfile
Adding VM to source control
Switching back to PG
Merge branch 'master' of github.com:eng/jeffs

Conflicts:
	Gemfile