Updated user model to separate out local fields for future facebook and G+ integration