DONE!!! :)

Fixes Matt's prior commit (Names for the transformers)
Merge branch 'master' of git://github.com/Mattredsox/Electric-Expansion

Conflicts:
	resources/electricexpansion/language/en_US.properties
	src/minecraft/electricexpansion/common/ElectricExpansion.java
	src/minecraft/electricexpansion/common/itemblocks/ItemBlockTransformer.java
Merge branch 'master' of git://github.com/Alex-hawks/UE-Electric-Expansion
disable redstone