Merged some more of my local .vimrc changes into vimrc