Merged John's and my Doctor and SurgeryType tables

Everything works. The web app needs to be updated to use more than just
a single name field for Doctors, which will allow me to revert a
workaround in the models.