add emmet to vundle, cleaned up vimrc