Capistrano addition
Merge branch 'capistrano'

Conflicts:
	Gemfile