Disabled expand-region
Merge branch 'master' of github.com:obreitwi/dot_vim

Conflicts:
	vundles.vim