consolidated files
Merge branch 'master' of github.com:feelobot/cucumber_sauce_tests