Merge branch 'master' of heroku.com:thawing-caverns-9374
added devise action mailer settings to config/environments/production.rb
added devise action mailer settings to config/environments/production.rb
added devise action mailer settings to config/environments/production.rb
added devise 'lockable' feature; confirmed that all devise modules are implemented
Again, no idea why I need a message here for a 'git pull' command from Heroku... >:-(

Merge branch 'master' of heroku.com:thawing-caverns-9374