Merge pull request #67 from warlordjones/master

Fixed the derpy stuff...
Added canisters and Steam Jetpack.Some useful comments
Switched to GitHub app
From GitHub app

Nothing to see here...
Merge branch 'pr/68'
Resolve Conflicts
Merge with fixed conflicts

Conflicts:
	src/main/java/steamcraft/common/config/Config.java
	src/main/java/steamcraft/common/config/ConfigItems.java
Followup Commit
Merge pull request #3 from BrassGoggledCoders/master

Pull in a few things