Flordia changes.
Merge branch 'master' of https://github.com/sam-truscott/tinker

Conflicts:
	build.gradle
	src/arch/arm/arm.c
	src/kernel/objects/obj_timer.c
Fix x86 I/O issue