Update bundles.vim
Update README.md
fix error
Merge pull request #9 from gracece/master

Update zencoding to emmet and neocomplcache
Update vimrc
Merge branch 'master' of github.com:humiaozuzu/dot-vimrc
Fix snipmate error
....
Merge https://github.com/humiaozuzu/dot-vimrc

Conflicts:
	bundles.vim