fixed so that files are removed after upload
added global and per request timeouts
ensured that we break out when over time
updated config with better comment
Merge pull request #47 from ben-jones/add_overall_timeouts

Add overall timeouts