R2 2 rivers

Changes to be consistent with other areaDetector modules, fix problems that prevented it from building with current version of areaDetector, etc.