add zencoding and misc tweaks
Merge branch 'master' of git://github.com/ilja/new-dot-vim

Conflicts:
	vimrc