Merge branch 'master' into nightly
Merge pull request #57 from BrassGoggledCoders/nightly

Using Master for readding
Add back Ores

Now featuring meta, and a meta sensitive ore gen handler, to boot!
Added back Steam
Add Surseance's Render Things
Commit Surseance Render Things

Signed-off-by: Arona Jones <warlordjones@gmail.com>
Things
Merge branch 'master' of https://github.com/warlordjones/SteamCraft2

Conflicts:
	src/main/java/steamcraft/common/Steamcraft.java
	src/main/java/steamcraft/common/blocks/BlockFluidSteam.java
	src/main/java/steamcraft/common/config/Config.java
	src/main/java/steamcraft/common/config/ConfigItems.java
Merge pull request #59 from warlordjones/master

Rebased my Ore Readditions into repo
I am derp.
Still a derp.
Gosh, I'm still a derp.
Merge pull request #60 from warlordjones/master

Fixed my MergeDerps
Added KeyHandler + Steam Boiler back.
Merge pull request #61 from warlordjones/master

Added KeyHandler + Steam Boiler back.
Merge pull request #3 from BrassGoggledCoders/master

Updates from the joint repo
Fixed ItemChisel; Some general cleanup; firearms
Major derps preventing the mod from running...
Merge branch 'master' into nightly
Merge pull request #63 from Surseance/nightly

Nightly merges