Add back in environ settings to wsgi server
Merge branch 'master' into production