updating collapse script
Merge branch 'master' of https://github.com/emfuller/Regional_Collapse
fixing units again
Merge branch 'master' of https://github.com/emfuller/Regional_Collapse