vimrc bundles.vim
Merge branch 'master' of https://github.com/eshion/.vim

Conflicts:
	bundles.vim
	vimrc
Merge branch 'master' of https://github.com/eshion/.vim
modified bundles.vim