caused two scope errors in village_activity; can't decide where to put this map stuff. Everything else is relatively fine
Merge branch 'exp'