Refactored tests to include e-mail when creating users. Renamed a step definition.
Merge branch 'master' of github.com:patrickf3139/bCal-Website