rename zencode to emmet
Merge branch 'master' of github.com:hackrole/hr-gvim-conf
merge vimrc conflicts, add some snippets

Conflicts:
	vimrc