Updated .vimrc.fork with key features from old vimrc