Reverted ME conduit fix until more testing is done
Merge branch 'master' of https://github.com/CrazyPants/EnderIO