turned on spell checker
fixed conflict Merge branch 'master' of github.com:ballcheck/stuff

Conflicts:
	.vimrc