Fix synonyms

Refs #176
Fix various issues related to adding patients

Refs #172
Screw you, Bill Gates

Refs #158, #163, #175