Replaced database.yml for config/database.example.yml
Deployment config files
Downgrade capistrano and switch live branch to ember_conversion
Better routes
Merge branch 'master' into ember_conversion

Conflicts:
	config/routes.rb