cherry pick
merge fix
Merge pull request #957 from flukeout/garbagefix

Garbage can sensitivity fix
more #941 fixes - rewrite error handling
Merge branch 'develop' of https://github.com/mozilla-appmaker/appmaker into develop