Cleaned and updated vimrc