added plugins
removed vim-rvm
added vim-js-beautify
merge conflicts