consider side_streams as part of waterways if they have the same name

fixes #155