Do not assume PGPORT env variable is unset during testing
Merge pull request #545 from CartoDB/master-do-not-assume-pgport

Do not assume PGPORT env variable is unset during testing