Incorporating Encounter Diagnoses into openmrs-core

Will schedule for Wednesday, September 20th