Move a few things around and changed a few settings for vimrc