Use release version of connect-s3
Refer directly to the settings module for config settings
Merge branch 'master' into env

Conflicts:
	lib/server.js
Refer to the correct settings module
Refer to the correct settings module
Switch tests to main settings file
Switch more tests to main settings file
Merge branch 'master' into env

Conflicts:
	test/data/fixtures.js
Handle file posting errors better
Fix the survey stats test
Use envrun tool to load test environment
Explain the use of envrun and .env files
Merge pull request #102 from LocalData/env

Pull settings in more directly from the environment
Merge branch 'master' into heroku-pg

Conflicts:
	lib/postgres.js