Stop using deprecated rvm format, use Gemfile.
Merge remote-tracking branch 'upstream/master' into specify-ruby-version-in-gemfile

Conflicts:
	.rvmrc
Merge pull request #42 from phiggins/specify-ruby-version-in-gemfile

Stop using deprecated rvm format, use Gemfile.