Updated CHANGELOG for past releases
Don't use username field for User
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
Updating changelog
Ignore .ruby-version
Mention about new column in activity_logging in 0.8.2 (close #465)
Highlight versions in readme
More contacts in readme
Removing unnecessary file [ci skip]
make send_email_* methods easier to overwrite
Converting README to md
[skip ci]
Cleanup
[ci skip]
Line in README about Rails 4
add specs
Merge pull request #473 from redstonelabs/master

Make send_email_* methods easier to overwrite
Updating changelog
[skip ci]