Merge pull request #204 from 4950/god

Removing MapBoundarySystem as we no longer use it, and it breaks stuff.