Restructure vimrc so it's a little more sane