Merge branch 'master' of git://github.com/Alex-hawks/UE-Electric-Expansion

Conflicts:
	src/minecraft/electricexpansion/common/RecipeRegistery.java
fix merge
Logistics Wire Recipe
Merge Matt's stuff