further ENV configurations
further ENV configurations
Merge branch 'dockerization' of github.com:digitalhelpersleague/zumhotface into dockerization

Conflicts:
	.env
	config/settings.yml
	config/unicorn.rb
travis ci dotenv fix