sjgjohnston: Committing some additional updates for sending the welcome email from the devise setup - including missing important routes.rb update.
Fix merge conflicts