Latest upstream changes manually merged in to this ongoing branch

Thought it best to do this as this branch is taking a while.  The only thing that conflicted and was manually merged was the basic_steps.rb step file and with the manual merge we seem to be back to the same state with red cukes and all green specs.