Merge https://github.com/akimboio/sleepy into develop

Conflicts:
	sleepy/base.py
Merge branch 'develop' of https://github.com/akimboio/sleepy into develop
* Added queryset out and update versions file
Merge branch 'develop' of https://github.com/adamhaney/sleepy