Breaking a test case so I know where to start.
Merge branch 'master' of github.com:tomseago/chokus