Merge branch 'master' of https://github.com/gnarula/django-ribbit