Update history to reflect merge of #2253 [ci skip]
Cleaned up cucumbers
Merge pull request #2258 from caffinatedmonkey/cucumber_cleanup