sjgjohnston: Committing ActionMailer component, and some db migration changes/corrections...
sjgjohnston: Adding the code to send the welcome email to a user upon successful signup.
Welcome stuff
Fix merge conflicts
Remove merge conflict warning
Merge pull request #24 from gomezlavin/master

Git last update
Fix ] errors in seeds.rb
sjgjohnston: Committing some additional updates for sending the welcome email from the devise setup - including missing important routes.rb update.
Fix merge conflicts
Tidy up routes.rb
minor user controller change