Merge branch 'master' into davec

Conflicts:
	basis/ui/backend/cocoa/cocoa.factor
	core/splitting/splitting-docs.factor
	core/splitting/splitting-tests.factor
Merge branch 'davec' of github.com:tgunr/factor into davec