Don't match people by middle name only
Fixed more middle name / gender cases and bug in nicknames rake task