LuaJ 3 Final. I'm not sure this is a good idea, but nothing seems to break (immediately).
Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7