update env for postgres install
merge changes from master