Update vimrc
Move all set directives together, add nrformats for ignoring octals for C-a and C-x