- Cleaned up unused methods in utils.py
- Changed how the debug flag is stored/used.
Moved with_retry from its own module into client.py.  Simplified unit tests accordingly.