merging fixes
Merge branch 'master' of https://github.com/masterthought/cucumber-reporting