Adds retries, cleans up client
Merge pull request #22 from HouseTrip/retries-cleanup

Client retries + cleanup