Merge pull request #1 from jasoncalabrese/feature/up-all-night

Changes to prevent hanging when the service gets destroyed
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into integration