Various vimrc modifications