Cleaned up vimrc some more