First batch of .vimrc changes