Start cleaning up the vimrc stuff again