Uses fix
Switched order of extends and uses in class declaration, cleanup
Prototype fix

Conflicts:
	extras/coffee-script.js