Cleanup the Vagrantfile.  Minor changes.
Merge branch 'master' of github-csd:jharveysmith/postgresql

Conflicts:
	recipes/server_streaming_master.rb