Deleted refactored-out code
Merge branch 'master' of github.com:jschmerge/xos

Conflicts:
	src/codecvt/codecvt.h