Improved logging. Untested.
We weren't merging multiple pages of file listings.

Added some logging.
Merge branch 'dustin'