Use an environment config over a config.js file

* Switch to environment variables
* But fallback to config.js (for now) when environment vars unavailable
* Ignore .env files
Merged heroku master and fixed app.js conflict