Merge remote-tracking branch 'torchbox/master'

Conflicts:
	setup.py

README.rst

@@ -1,8 +1,21 @@
 Wagtail CMS
 ===========
 
-Wagtail is a Django content management system focused on flexibility and user experience. Find out more at `wagtail.io <http://wagtail.io/>`_
-and `torchbox.github.io/wagtail <http://torchbox.github.io/wagtail/>`_. 
+Wagtail is a Django content management system built originally for the `Royal College of Art <http://www.rca.ac.uk/>`_ and focused on flexibility and user experience. Its features include:
+
+* A fast, attractive editor interface
+* Complete control over design with standard Django templates
+* Configure content types through standard Django models
+* Tightly integrated search (with an `Elasticsearch <http://www.elasticsearch.org/>`_ backend for production)
+* Strong document and image management
+* Wide support for embedded content
+* Simple, configurable permissions
+* Support for tree-based content organisation
+* Optional preview->submit->approve workflow
+* Fast out of the box. `Varnish <https://www.varnish-cache.org/>`_-friendly if you need it
+* Tests! But not enough; we're working hard to improve this
+
+Find out more at `wagtail.io <http://wagtail.io/>`_. 
 
 Getting started
 ~~~~~~~~~~~~~~~
@@ -10,4 +23,4 @@ To get you up and running quickly, we've provided a demonstration site with all
 
 Contributing
 ~~~~~~~~~~~~
-If you're a Python or Django developer, fork the repo and get stuck in! Send us a useful pull request and we'll post you a `t-shirt <https://twitter.com/WagtailCMS/status/432166799464210432/photo/1>`_. 
+If you're a Python or Django developer, fork the repo and get stuck in! Send us a useful pull request and we'll post you a `t-shirt <https://twitter.com/WagtailCMS/status/432166799464210432/photo/1>`_. Our immediate priorities are better docs, more tests, internationalisation and localisation.

setup.py

@@ -43,9 +43,7 @@ setup(
         "South>=0.8.4",
         "django-compressor>=1.3",
         "django-modelcluster>=0.1",
-        "elasticutils>=0.8.2",
-        "pyelasticsearch>=0.6.1",
-        "django-taggit==0.10",
+        "django-taggit>=0.11.2",
         "Pillow>=2.3.0",
         "beautifulsoup4>=4.3.2",
         "lxml>=3.3.0",

wagtail/wagtailadmin/templatetags/gravatar.py

@@ -29,7 +29,6 @@ class GravatarUrlNode(template.Node):
 
         default = "blank"
         size = int(self.size) * 2 # requested at retina size by default and scaled down at point of use with css
-        print size;
 
         gravatar_url = "//www.gravatar.com/avatar/" + hashlib.md5(email.lower()).hexdigest() + "?"
         gravatar_url += urllib.urlencode({'s': str(size), 'd': default})