Re-added Emmet
Merge branch 'master' of github.com:ArayB/dotvim