added twittername to user resource, still need to update the application controller on if the current user is nil
merged the dev branch into the twitter branch
twittername added