Feature/retry timeouts

Actually enable the retry code. Also set a max timeout on POST requests.