Moved around some settings for vimrc