Increase width of stream, ditch, and drain

* Resolves #896.
* Resolves #967.
Merge pull request #975 from math1985/stream-width

Increase width of stream, ditch, and drain