Correct a couple more references to simplejson
Quote first argument of {% url %} template tag
Remove Q.subtree_parents attribute in shallow_copy_Q()
Provide include_auto_links when creating NavBarCategory in ProgramFrameworkTest