updating user model to include uid to accurately pull facebook data.
updating schema for users to include uid.
fixing spacing in user model to look nice
merged dave's index page manually
courtney's changes to user table and uid
merging courtney's changes to user table and uid onto master
fixed conflicts from tim's update locally
merging tim's update to paperclip locally