Resolution of merge conflict
Adding pass-through routes (for auth, plugins, etc) to routes.py

This makes sure they won't be inappropriately captured by the tree-view
routes below.
Proper loading of local comments as we move through the tree.