Merge https://github.com/labouseur/TSOS-2014 into typescript

Conflicts:
	dist/scripts/os/console.js
	source/scripts/os/console.ts
Stuff started messing up because I didn't have the branch, trying to fix