Fix deployment in production environment
Conflicts:
	config/environments/production.rb
Fix indentations and whitespace
Move the load of config/application.yml into config/application.rb
Do a little housekeep in config files
Merge branch 'fix_production_deployment' into fluenta

Conflicts:
	Gemfile
	config/application.example.yml
	config/application.travis.yml
	config/environment.rb
	config/environments/test.rb