Fixed unlock_token_mailer_disabled to match its description
Cleaned up code in lock! method
Adding tests to verify unlock_token_mailer_disabled
Removing redundant test
Merge pull request #467 from gyardley/master

Fixed unlock_token_mailer_disabled to only disable automatic mailing