Changes amazon payment import to check for existing contact mapping.
Merge branch 'dev' of github.com:elplatt/seltzer into dev
Merge branch 'dev' of github.com:elplatt/seltzer into dev
Updates copyright date and email.
Fixes sort order on payment list.
Merge remote-tracking branch 'upstream/dev' into dev