commit before merging and branching to classy
Merge branch 'classy' of https://github.com/aleaf/SFR into classy
Merge branch 'classy' of https://github.com/aleaf/SFR into classy

Conflicts:
	SFR_classes.py
added intersect_contours (preproc for ElevsFromContours)
added sfr_plots.py; class for plotting stream profiles by COMID
added compute_zonal to SFR_arcpy
"Almost done with adding class ElevsFromDEM."
Added assign_layers and removed from it all segment ordering and SFR file writing. Instead, it now writes out the MAT1 file for use by build_SFR_package method.
Merge remote-tracking branch 'upstream/classy' into classy
Merge pull request #36 from mnfienen/classy

Classy
merge of conflicted files