renamed Calendars column key => e-mail; refactored cucumber tests and models/controllers but not sure if I fixed all of it