Lots of updates to my .vimrc