Make most of the specs pass
Merge branch 'master' of https://github.com/popox/ShotHere