Fix issue with GAE and shutdown
Merge pull request #190 from PerfectCarl/remove-gae-conf

Fix issue with GAE and shutdown
Merge pull request #1 from greenlaw110/master

merge with origin