Remove zencoding
Merge branch 'master' of https://github.com/greatghoul/vimfiles

Conflicts:
	.gitmodules