merging josh
adding sysadmins group to users json
Merge branch 'chef-server-refactor' of github.com:jtimberman/rubygems-aws into someara
Merge branch 'chef-server-refactor' of github.com:jtimberman/rubygems-aws into someara