Some work on the steam Coal Generator.
Fully functional Steam Boiler.

Work on canisters and some cleanup.
Fixed GUI render.
Merge pull request #47 from decebaldecebal/master

Finished work on Steam Boiler
Merge branch 'refs/heads/master' into nightly

Signed-off-by: Arona Jones <warlordjones@gmail.com>

Conflicts:
	common/steamcraft/client/core/handler/GuiHandler.java
	common/steamcraft/client/gui/GuiCoalGenerator.java
	common/steamcraft/common/block/ModBlocks.java
	common/steamcraft/common/block/tile/TileEntityBasicSteamBoiler.java
	common/steamcraft/common/block/tile/TileEntityCoalGenerator.java
	common/steamcraft/common/block/tile/container/ContainerCoalGenerator.java
	common/steamcraft/common/item/ItemElectricMod.java