Add Emmet to vim plugin and change from Macvim to vim installed by brew