DRYed out some cuke steps and moved others to navigation_steps for nav consistency
Merge pull request #115 from rbatta/develop

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