Various changes to vimrc