Fixes #359.
Brought back the workaround for IC2 not giving a damn about the returned value from energy injection (and therefore energy getting lost). Closes #348.
Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7