fixed a bug in divide_at_confluences that was causing circular routing.
fixed another bug with enclosing TPL variable in SFR tpl file
Merge branch 'classy' of https://github.com/aleaf/SFR into classy