Did some stuff to conduits
Merge branch 'master' of https://github.com/nedhyett/ElementalCraft

Conflicts:
	src/nedhyett/elementalcraft/core/registries/ElementalCraftBlocks.java