replace zencoding with emmet
Merge branch 'master' of https://github.com/reedboat/my-conf
merge