#90 Begun work on RedStoneUpdate (not a working branch)
Merge remote-tracking branch 'sneakernet/master' into RedstoneUpdate

Conflicts:
	anglewyrm/src/Recipes.java
	boycat97/src/EntityAILumberjackChopTree.java
	boycat97/src/EntityAILumberjackPlantSapling.java
	src/ColoniesMain.java
Merging v1.4.7 into RedstoneUpdate