outputting the environment we're running in
I have no idea what's going on right now
adding environment stuff to staging branch, along with appropriate value for the branch
adding system config
Merge branch 'system-config'
Merge branch 'origin/staging'

Conflicts:
	config/environment.py