Improved multi-level matcher and fixed performance problems encounted on large shapefiles.
Merge branch 'production2' of github.com:bedatadriven/activityinfo into production2