Implement MCP-805's changes, plus more re-fixes.

Signed-off-by: Mike Howe <dockter@almuramc.com>
Merge branch '1.6' of https://github.com/Legacy/Spoutcraft into 1.6

Conflicts:
	src/main/java/net/minecraft/src/TileEntitySign.java