Update the overlord solution

There's some confusion here about how to structure a Cucumber test. The steps should be structured as follows:

* `Given` lays out preconditions to the test (such as setting up objects that should exist or a starting page from which to  begin the test. Typically this will be where factories / mock objects will be initialized.
* `When` should include steps for exercising the application. This will be where `click_on`, `fill_in`, `visit`, etc etc steps are called.
* `Then` should include assertions about the resulting state of the system. Calls to `expect` should only occur in then steps.