misc changes
Merge branch 'master' of https://github.com/raghur/vimfiles

Conflicts:
	_vimrc