Full merge of @lwinslow-usgs and @jread-usgs WiLMA edits

All conflicts fixed and we should be back on track