Gluing RWps and Ext together

Updated to reflect Ivan's comments in https://github.com/USGS-CIDA/glri-afinch/pull/14