premerge commit before bringing in Mikes latest
Merge remote-tracking branch 'upstream/classy' into hwrclassy

Conflicts:
	SFR_main.py
SFR Reach and Segment Objects
Merge pull request #31 from hwreeves-USGS/hwrclassy

Hwrclassy