tweaks
Merge branch 'master' of github.com:rememberthemer/vimfiles

Conflicts:
	vimrc