Enabled json api for users. Adding email and role to json response.
Sawyer has merged the changes for caching. Updating gemfile to get
latest gem.
Updating sawyer.
White space
Merge branch 'master' into pswadi/get-users-json

Conflicts:
	Gemfile
Merge branch 'master' into pswadi/get-users-json
Merge branch 'pswadi/get-users-json' of https://github.com/zendesk/samson into pswadi/get-users-json
Removed role from users.json
Merge pull request #63 from zendesk/pswadi/get-users-json

Pswadi/get users json