WIP
Capistrano Rails
Merge branch 'master' into cap

Conflicts:
	config/database.yml