Merge conflict in agignore
Remove vim-rspec, change colorscheme
Remove unneeded rvm configs