Fixed issue where multiple default preferred labels would be applied if mapping did not provide a preferred label mapping for a merged record
Merge branch 'master' of git://github.com/collectiveaccess/providence