Change from zendocing to emmet. Zencoding depreciated.
Update vim plugin submodules.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitmodules