merge Sam's work on school and neighborhood filters

closes #4 and #27