Bring in contents of old .vimrc.local

Since I now use these settings everywhere anyway, and am no longer using
SPF13, it doesn't make sense to have these separated out anymore.