Merge pull request #29 from Alghayma/master

Merge pull request #28 from Alghayma/production
Merge pull request #30 from Alghayma/master

BATIKH FIXES
If we have issues with Redis, we can just reschedule everything in a queue
Merge pull request #31 from Alghayma/production

Pushing back to master