First whack at post-transition cleanup.
Album matching tweak, bug fixes, comment cleanup.
Don't retry failing API requests.  Fix silly bug with ampersand replacement.
Fix the last of the bad requests.  Tweaks to album matching.
Post-JSON-phase-in cleanup.  More legible code/comments.  Fix a few bugs while we're at it.