Merge pull request #9 from mdakin/master

Add simple timeout and throttling support.
Move more stuff to report, minor cleanup