Merge pull request #13 from dimagi/cz

misc pep-8 stuff
give elastic pillows a configurable timeout