Reorganized and removed cruft from vimrc