Merge branch 'master' of github.com:tuttinator/cranberry
Updated cli spec to run in a thread
Stubbing next test
Merge conflict