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
bump sawyer, pr got merged
Merge pull request #65 from zendesk/grosser/sawyer

bump sawyer, pr got merged
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
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