Add emmet-vim. Minor changes.