merge scody-default with master
reverting tests to commit 9cd63b7ac864ec3a6af70cb466db22e3e9e725eb

LogCapture methods didn't look fully implemented on HEAD
fixing type, stupid vim
Merge pull request #2 from dimagi/scody-default-master

Scody default master merge