MapMenuDelegate Protocol Cleanup

Merged both Church and rebanho protocols into a single protocol, in a
separate file.