Use new step syntax
Fix all bugs, again
Merge branch 'master' of github.com:oleander/jbay