Made the aff-guess-merchant test more concise.
Added a test for #'aff-dissect-amazon-url, fixed the bug that it revealed (was using string-match/match-string incorrectly), fixed the parallel bug in #'aff-dissect-itunes-url.