made jwishnie merge functional
made jwishnie merge functional

peterayeni/rapidsms,ehealthafrica-ci/rapidsms,unicefuganda/edtrac,ehealthafrica-ci/rapidsms,dimagi/rapidsms-core-dev,unicefuganda/edtrac,eHealthAfrica/rapidsms,catalpainternational/rapidsms,caktus/rapidsms,lsgunth/rapidsms,peterayeni/rapidsms,caktus/rapidsms,ken-muturi/rapidsms,dimagi/rapidsms,dimagi/rapidsms,lsgunth/rapidsms,ken-muturi/rapidsms,eHealthAfrica/rapidsms,catalpainternational/rapidsms,catalpainternational/rapidsms,rapidsms/rapidsms-core-dev,catalpainternational/rapidsms,eHealthAfrica/rapidsms,caktus/rapidsms,peterayeni/rapidsms,lsgunth/rapidsms,dimagi/rapidsms-core-dev,lsgunth/rapidsms,peterayeni/rapidsms,rapidsms/rapidsms-core-dev,unicefuganda/edtrac,ehealthafrica-ci/rapidsms,ken-muturi/rapidsms