Merge branch 'master' into nightly
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
Merge branch 'master' of https://github.com/BrassGoggledCoders/SteamCraft2 into nightly

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

Conflicts:
	src/main/java/steamcraft/common/Steamcraft.java
	src/main/java/steamcraft/common/SteamcraftWorldGenerator.java
	src/main/java/steamcraft/common/WorldGenerator.java
	src/main/java/steamcraft/common/blocks/BlockCosmeticSolid.java
	src/main/java/steamcraft/common/blocks/BlockFluidSteam.java
	src/main/java/steamcraft/common/config/Config.java
	src/main/java/steamcraft/common/config/ConfigBlocks.java
	src/main/java/steamcraft/common/lib/world/SteamcraftWorldGenerator.java