Route nesting cleanup
Merge pull request #2 from jashwell/route-cleanup

Route nesting cleanup