smarter timeout
Merge branch 'master' of https://github.com/openrosetta/openrosetta