bring down updates
Merge branch 'master' of https://github.com/nygeog/msm

Conflicts:

scripts/00c-construct_neighborhood_definitions/00-construct_neighborhood
_definitions_iMac.py
ed