Fixes #92

Adds extensive retries in several places in the code to ensure that we
get back in line for new IPs. Additionally, some places weren't wrapped
as they should have been.
Merge pull request #93 from Cerberus98/retry_harder_merge

Fixes #92