Album matching tweak, bug fixes, comment cleanup.
Don't retry failing API requests.  Fix silly bug with ampersand replacement.