updated settings
Merge branch 'master' of github.com:sillyotter/vimfiles

Conflicts:
	.gvimrc
	.vimrc