Pulled river generation out into package.

- Fixed elapsed time setting.
- time.Format calls now use builtin constants