Fixed the machines.
Merge branch '1.7' of https://github.com/CrazyPants/EnderIO into 1.7