update river
Merge branch 'master' of http://github.com/bsknowl/mondial-java

This is where I insert comments?
Updated river, estuary, and main.