Added scopes, updated users
Merge pull request #1 from coffeeaddict/master

Added scopes, updated users