merge master + develop
merge master + develop

Merge branch 'develop' of usgs_github:USGS-R/streamMetabolizer into develop

Conflicts:
	DESCRIPTION

Arroita/streamMetabolizer,aappling-usgs/streamMetabolizer,USGS-R/streamMetabolizer