Fix compile errors
Merge branch 'master' of https://github.com/CrazyPants/EnderIO.git