Various tweaks to line/column reporting, and fixed a few tests.
Merge branch 'master' of github.com:cucumber/bool