Merge pull request #132 from SenseiKiwi/master

Fixed Gateway Crash (for real)
Gateways completed

Also added limbo gateways
Fixed gateway crashes
Merge remote-tracking branch 'upstream/master'