Let's see how horribly this will fail.
Hmm.
Cleanup.
Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10

Conflicts:
	src/main/scala/li/cil/oc/OpenComputers.scala
	src/main/scala/li/cil/oc/common/EventHandler.scala