Finish Mekanism Support.
Fix some TE Names
Merge branch 'master' of https://github.com/joshiejack/ModTweaker

Conflicts:
	src/main/java/modtweaker/ModTweaker.java
	src/main/java/modtweaker/thermalexpansion/TEHacks.java
	src/main/java/modtweaker/thermalexpansion/ThermalExpansion.java
	src/main/java/modtweaker/util/TweakerBaseValue.java
	src/main/java/modtweaker/util/TweakerHelper.java