Cleaning up.
Merge branch 'master' of https://github.com/unautre/OctopOS

Conflicts:
	kern/Makefile
	userland/Makefile
	userland/libc/Makefile