Begin SimpleImpl upgrade.
Only machines package remains, lots to do in there.
Start work on machines and fix some mistakes.
Merge branch '1.7' of https://github.com/CrazyPants/EnderIO into CrazyPants-1.7

Conflicts:
	src/main/java/crazypants/enderio/conduit/gui/ItemSettings.java
	src/main/java/crazypants/enderio/conduit/packet/PacketItemConduitFilter.java
Merge branch 'CrazyPants-1.7' into 1.7
Back to where we were
Merge branch '1.7' of https://github.com/tterrag1098/EnderIO into 1.7
It compiles AND crashes a lot. Woohoo!