Specify Django 1.6 only in requirements (1.7 is going to require compatibility fixes)
repair collateral damage from a hail of bullet points
Merge branch 'master' of github.com:torchbox/wagtail