Started with the gem.
Merge branch 'master' of github.com:raskhadafi/capistrano-torquebox

Conflicts:
	.gitignore
	README.md