Add zencoding
Merge branch 'master' of github.com:cursork/Vim-Setup

Conflicts:
	install_bundles.sh