Merge branch 'master' of https://github.com/nedhyett/ElementalCraft

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