Merge branch 'master' of git://github.com/melinath/philo

Merge branch 'master' of git://github.com/melinath/philo

* 'master' of git://github.com/melinath/philo:
  Enabled Embed rule inheritance from parent templates and to included templates with a bit of overriding of EmbedNode methods and use of context.render_context similar to BlockNodes. Removed {% embed as <varname> %} syntax as obsolete. Added tests for {% embed %} tags in various situations.
  Switched template loading from Template.loader to philo.loaders.database.Loader in keeping with Django's recommended way of implementing loaders. Note that the origin of the template is considered to be the actual instance instead of a path, as this seems more strictly accurate. The instance is converted to unicode by the loader to more correctly fit the expected "display_name". Removed origin and django_template properties from templates. Corrected a minor error in the node_url templatetag for contexts not containing 'node'.
  Switched node_view conditions for raising MIDDLEWARE_NOT_CONFIGURED to actually check whether the middleware is configured. This allows errors in request.node evaluation to propogate and be more easily debugged.
  Added get_branch support to TreeManager.
  Added support for recursive trees - i.e. recursion checks to prevent infinite loops. Improved efficiency of TreeModel.get_path method by removing has_ancestor check. Shortened and clarified NodeURLTestCase; added test case for TreeModel paths and ancestor checks.
  Increased specificity of penfield get_article conditions for 404 raising. Corrected get_with_path handling of trailing pathseps to re-add them to the path's remainder.
  Customized FilterSelectMultiple widget for Tags to allow one-click adding of tags not found with normal filtering. Addresses feature #9 for the built-in admin interface.
  Improved general efficiency of TreeManager's get_with_path method in terms of number of queries by implementing a halving algorithm. Can require more queries than the previous algorithm in cases where the remainder following the deepest node is relatively long.
  Shunted responsibility for 404 and 500 error catching from node_view to RequestNodeMiddleware. Made minor corrections to ManyToMany values and descriptors.
  Minor correction to Waldo logout view to fall back to the node's absolute_url if HTTP_REFERER is not found in request.META
  Tweaked Entity and TreeEntity to pass an actual queryset to QuerySetMapper instead of a manager. The results are generally the same, and anyone accessing querysetmapper.queryset will be expecting to find a queryset.
  Switched Attribute ManyToManyValues to have a ManyToManyField to ForeignKeyValues instead of a CommaSeparatedIntegerField. This allows joined queries and referential integrity. In the long run, it also simplifies adding support for non-integer primary keys.
  Cleaned up ManyToManyValue set_value method. Also tweaked container template tag to recognize a contentlet as dynamic if it only contains a variable.