Adds name, token, and tokenSecret to user model
Merge branch 'addKeysToUserModel' into dev