Aruba testing

Merge in Lance's PR to see if my changes fix his PR and so that I can use his aruba work to verify that my fix for [MSP-11153](https://jira.tor.rapid7.com/secure/RapidBoard.jspa?rapidView=84&selectedIssue=MSP-11153) inside gherkin files.