add modis-water
Merge branch 'master' of https://github.com/fengm/geocode