update requirements in setup.py
remove stray print statement from gravatar tag
Merge branch 'master' of github.com:torchbox/wagtail