some more updates
Merge branch 'master' of github.com:clemensp/dotvim

Conflicts:
	vundles.vim