Fixes
Merge branch 'master' of github.com:jschmerge/xos

Conflicts:
	src/codecvt/test.cc
Dead code
More progress