Fixes to setup.py to create a usable package
Merge branch 'master' of github.com:torchbox/wagtail