Clean up bashrc, update vimrc with lots of new plugins