More functions and Makefile cleanup
Merge branch 'master' of github.com:jschmerge/xos

Conflicts:
	src/Makefile.include