Add an Django admin command to merge two people

This replaces a series of manual manual steps which you used to
have to perform if you ended up with duplicate people in the
database, for example after a big data import where names are
ambiguous.