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.
Added missing return statement
Update README.rst
PEP8 fixes from #41
Merge branch 'master' of github.com:torchbox/wagtail
Merge pull request #59 from levigross/master

Added missing return statement
Merge branch 'master' of https://github.com/stevenewey/wagtail into stevenewey-master
Merge branch 'master' of github.com:torchbox/wagtail
Merge remote-tracking branch 'torchbox/master' into feature/unit-tests