removed rvm from template because it will be set from the rvm plugin
Merge branch 'release/0.5.1'