Merge branch 'master' of github.com:torchbox/wagtail

README.rst

@@ -19,7 +19,7 @@ Find out more at `wagtail.io <http://wagtail.io/>`_.
 
 Getting started
 ~~~~~~~~~~~~~~~
-To get you up and running quickly, we've provided a demonstration site with all the configuration in place, at `github.com/torchbox/wagtaildemo <https://github.com/torchbox/wagtaildemo/>`_; see the `README <https://github.com/torchbox/wagtaildemo/blob/master/README.md>`_ for installation instructions.
+To get you up and running quickly, we've provided a demonstration site with all the configuration in place, at `github.com/torchbox/wagtaildemo <https://github.com/torchbox/wagtaildemo/>`_; see the `README <https://github.com/torchbox/wagtaildemo/blob/master/README.md>`_ for installation instructions. `Serafeim Papastefanos <https://github.com/spapas>`_ has kindly written a `tutorial <https://gist.github.com/tomdyson/8974456>`_ with all the steps to build a simple Wagtail site from scratch.
 
 Contributing
 ~~~~~~~~~~~~

wagtail/wagtailembeds/templatetags/embed_filters.py

@@ -1,7 +1,7 @@
 from django import template
 from django.utils.safestring import mark_safe
 
-from wagtail.wagtailembeds.embed.embeds import get_embed
+from wagtail.wagtailembeds.embeds.embed import get_embed
 
 
 register = template.Library()