Deploy com o capistrano
Merge branch 'master' of https://github.com/handcom/Joe

Conflicts:
	config/deploy.rb
Exclusao deploy