Spelling errors.
Spelling fixes, repair conflict
Conflicts:
	bin/cf