Changes to postgres.
Removes username for production.
Merge branch 'master' into bootstrap

Conflicts:
	Gemfile