Add emmet-vim and Remove zencodig-vim
Merge branch 'testing'