Added remainder of columns, removed dependency on kenyaemr dictionary utils
Restored dependency on kenyaemr, added generic converter