More cleaning up of scenario verbiage.
Cleaned up some stuff in the users.yml
Miscellaneous code clean up in the step definitions.
Adding new question sets for s2s opportunities