Remove some plugins
Merge branch 'master' into use_rvm