Incorporate pull request comments
Merge branch 'remco-simplify-shapefiles' of github.com:lizardsystem/lizard-rainapp into remco-simplify-shapefiles