Comment environment variables
Merge branch 'postgres' into mysql
Update docs for MySQL