Added scope for finding a user by their email or password and implemented it in the sign_in process

Conflicts:

	app/models/user.rb
Removed extraneous sign_in link on sign_up page
Changed sessions controller test to reflect parameter name change