Still a mess, but cleaned up vimrc a bit