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-tests.factor
	core/io/files/files.factor
	core/io/io-tests.factor
	core/io/streams/c/c-tests.factor
	core/io/streams/lines/lines-tests.factor
	core/source-files/source-files.factor
	extra/benchmark/sockets/sockets.factor
	extra/http/server/templating/templating-tests.factor
	extra/http/server/templating/templating.factor
	extra/io/launcher/launcher.factor
	extra/io/mmap/mmap-tests.factor
	extra/io/unix/launcher/launcher.factor
	extra/io/unix/unix-tests.factor