try and fix race condition
Merge branch 'master' of github.com:openoakland/adopt-a-drain