Merge pull request #3 from jasnow/master

Misc changes; cukes still broken