name environment correctly in config
Merge branch 'origin/staging'
Merge branch 'origin/staging'

Conflicts:
	config/environment.py
Merge branch 'master' into production
Merge branch 'origin/staging'

Conflicts:
	config/environment.py
Merge branch 'env-desc'

Conflicts:
	config/environment.py
	neat-program.py
Merge branch 'origin/staging'

Conflicts:
	config/environment.py
	neat-program.py
committing something. i'm not sure what.