Require buildings other than warehouses to be entirely within settlements. Fixes #1970. Fixes #969.