Merge branch 'origin/production'
ignore *pyc files throughout
empty package file
config file for environment vars
outputting the environment we're running in
Merge branch 'origin/master'
name environment correctly in config