Hide secrets from appearing in logs
Move recipes into new capistrano-fiftyfive gem
Merge branch 'master' into rails-4-upgrade

Conflicts:
	config/application.rb
	config/recipes/secrets.rb