added in a very basic oauth for facebook
setting up db queries
merged oauth to development
merge of other user
replace roots
merged at monday lunchtime
added in the first and last name fields from facebook
merged in oauth again
implementation of mandrill. complete and ready to test
you dont need to add a password when editing your password with facebook
mandrill deployment, changes made to development.rb
conflict resolution