DRYed out some cuke steps and moved some steps for nav consistency

Seemed like a lot of repetition in cucumber steps, so...
Refactored and DRY'd out some cuke steps. One of which was a case statement for "then i should be on ___ page"
Moved nav steps to navigation_steps to make it easier for devs to find. (e.g. "when i click on ___ link" shouldn't be in basic steps but in navigation steps)