Added cucumber test to get us part of the way to testing the merge feature
and added the accompanying changes to paths and websteps to implement the new
tests.
added a few more steps to the scenario for merge
fixed a typo!