Move gender to be after DOB.

refs #395