re-add modified mapkeeper (not as a subproject)