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
The Start Trek Into Darkness fiasco
Merge pull request #430 from digitalnatives/fix_production_deployment

Fix deployment in production environment