Merge branch 'master' of git://factorcode.org/git/factor into unicode

Merge branch 'master' of git://factorcode.org/git/factor into unicode

Conflicts:

	core/io/files/files-docs.factor
	core/io/files/files-tests.factor
	core/io/files/files.factor
	core/listener/listener.factor
	extra/benchmark/sum-file/sum-file.factor
	extra/bootstrap/image/upload/upload.factor
	extra/http/server/templating/templating.factor
	extra/logging/server/server.factor
	extra/smtp/smtp.factor
	extra/tools/deploy/macosx/macosx.factor
	extra/tools/disassembler/disassembler.factor
	extra/webapps/file/file.factor