Updated zencoding.vim to emmet.vim
Merge branch 'master' of https://github.com/hesselbom/hesselbom-vimrc