Merge branch 'extract-retry' into master
some pylint fixes
kill off retry sleeper
retry deadline!
add logging to retry