zencoding.vim -> emmet.vim
change zsh theme from funcy to fox
fix conflict