Cleaned up commit log

See "cucumber" branch if you want to watch me stumble around in the dark
Finishes #2