timeout changes to protect against crazy usage
Merge pull request #6 from mozilla-appmaker/t1703

timeout changes to protect against crazy usage