misc changes
Merge branch 'master' of https://github.com/rbultman/vimrc-settings

Conflicts:
	vimrc