use my individual changes
check in my bundles.vim
extend gitignore
Merge branch 'master' of git://github.com/vonTronje/vimfiles

Conflicts:
	bundles.vim
	vimrc