Merge git://github.com/derega/philo into develop. Merged derega's nav example changes...

Conflicts:
	docs/tutorials/shipherd.rst

diff --cc docs/tutorials/shipherd.rst
Simple merge

diff --cc philo/contrib/shipherd/templatetags/shipherd.py
index f522dfa,85a0bc5..4fae9c4
--- 1/philo/contrib/shipherd/templatetags/shipherd.py
--- 2/philo/contrib/shipherd/templatetags/shipherd.py
+++ b/philo/contrib/shipherd/templatetags/shipherd.py
@@@ -131,7 -131,7 +131,7 @@@ def recursenavigation(parser, token)
                <ul>
                    {% recursenavigation node "main" %}
                        <li{% if navloop.active %} class='active'{% endif %}>
--                          {{ item.text }}
++                          <a href="{{ item.get_target_url }}">{{ item.text }}</a>
                            {% if item.get_children %}
                                <ul>
                                    {{ children }}