Merge pull request #1 from torchbox/master

Update to latest
Decouple from Django default user model to allow custom user models.
Reverted runtests DB credentials before PR.
Merge branch 'master' of https://github.com/stevenewey/wagtail into stevenewey-master
Merge branch 'master' of github.com:torchbox/wagtail