Removed s111.okserver.org.yml
Removed s095 yml file
Merge remote-tracking branch 'okfn/master'
Merge remote-tracking branch 'okfn/master'
Merge remote-tracking branch 'okfn/master'
Merge remote-tracking branch 'okfn/master'
Merge remote-tracking branch 'okfn/master'
Merge remote-tracking branch 'okfn/master'
Merge remote-tracking branch 'okfn/master'
Changed backups_to_s3 script to use awscli
Removed restarts from collectd role, which weren't working.
Changed the permissions on the collectd copy to 0755, so the script can work and changed reload to be called restart as that's more accurate
Merge branch 'awscli'