add script timeout, integration tests, and cleanup dead code#23

ncode merged 1 commit intomainncode/tagit:mainfrom

juliano/updates_and_integrationncode/tagit:juliano/updates_and_integrationCopy head branch name to clipboard