Fixed issue locally that was probably already commited,
and added 1st cut at do_unshift
Merge branch 'master' of github.com:jschmerge/xos

Conflicts:
	src/unicode/utfconv.h