Minor config changes
Merge branch 'master' of https://github.com/mmeyer1/zap

Conflicts:
	config/environments/production.rb