Merge branch 'master' of github.com:rvm/rvm1-capistrano3

Conflicts:
	.gitignore
	Gemfile
	README.md