Comment environment variables
Merge branch 'postgres' into simple

Conflicts:
	config/postgresql.yml