Don't run CI on working branches.
Update Rails for security vulnerability.
Capistrano deploy reorganized itself, move our hooks.
Merge branch 'master' into configuration-in-database

Conflicts:
	Gemfile.lock