Added more $users functionality. Added some step definitions that combine logging in as part of the step.