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.
dont allow viewers to see the redeploy button
Correct use of samson roles
use upstream sawyer now that fix is merged
not sure why this changed itself
White space
bump sawyer, pr got merged
Merge pull request #65 from zendesk/grosser/sawyer

bump sawyer, pr got merged
comment out optional env to make tests not fail / not blow up everything
do not load .env in test mode to have reproducible tests / not break the tests by changing .env
One more shellescape required
Merge pull request #68 from zendesk/pobrien/sec_fixes_1_1

One more shellescape required
more conservative Gemfile
Merge branch 'master' into roman/viewers_cant_redeploy

Conflicts:
	Gemfile.lock
Merge pull request #64 from zendesk/roman/viewers_cant_redeploy

dont allow viewers to see the redeploy button
Add Jenkins integration
Merge branch 'master' into pswadi/get-users-json

Conflicts:
	Gemfile
Merge branch 'master' into pswadi/get-users-json