get tests to work
Merge branch 'master' of github.com:mmartinson/kill-the-king

Merging is the best