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