added some contour intersect inputs
pre-merge
adding input for elevation contour intersection
added rfact to SFR_setup.xml; elevation contour intersection input
Added sorting of hydrosequence and a couple new filenames in the input file
Merge pull request #19 from hwreeves-USGS/hwrclassy

Hwrclassy
resolve merge conflict
Merge pull request #22 from mnfienen/mnfienen-classy

Mnfienen classy
working on interp of contour elevs
resolved merge conflict
Fixed a bug in make_rivers_table in creating ordered FIDs

Also updated CleanupRiverCells.py so it works with XML input file
Merge pull request #23 from mnfienen/classy

Fixed a bug in make_rivers_table in creating ordered FIDs
levelpath FID pruning because of short reachlengths
fixed up reach ordering --- this is the end of the old assign_and_route.py
Merge remote-tracking branch 'upstream/classy' into classy
Merge pull request #24 from mnfienen/classy

Classy
pre-merge with merge conflicts resolved locally
Merge remote-tracking branch 'aleaf/classy' into hwrclassy