modified:   index.rst
Work in progress on issue #459
Please do not review/comment yet.
	modified:   docs/gettingstarted/postgres-application.yml
Merge branch 'master' into postgres-docker-459
Merge branch 'master' of github.com:ClusterHQ/flocker into postgres-docker-459

Conflicts:
	docs/gettingstarted/tutorial/Vagrantfile
typo correction, no parameter on vagrant up
No need to redo virtual machines.
Slightly nicer note.
Nicer way to find container.
Some whitespace deletion.
Use official postgres image.
Correct mountpoint.
Transcript that is hopefully what will really happen in last bit.
Remove most references to our custom image.
No password in this image.
Lots of editing and formatting.
No password.
	modified:   postgres.rst
Merge branch 'postgres-docker-459' of github.com:ClusterHQ/flocker into postgres-docker-459

Conflicts:
	docs/gettingstarted/postgres.rst
Remove clusterhq/postgres from Vagrantfile