Added the email configuration to the Hilary module
Fixed up emails throttling config in the hilary config
Add archive etherpad install, remove git and apt
Enable the error pages on the global administrator tenant
(EtherpadArchiveInstall) Update docs)
Upgrade production and staging to 6.0
Bumping release environment to 6.1.0 RC1
Upgrade release environment to 6.1.0
Bump production and staging environment to 6.1
Bump release environment to 6.1.1
Bump production to 6.1.1
Fix trailing comma in performance activity-cache.json
Merge branch 'master' into etherpad-archive-install

Conflicts:
	environments/qa/hiera/release.json
Merge pull request #91 from mrvisser/etherpad-archive-install

Add archive etherpad install, remove git and apt
Add 3rd etherpad to staging nodes.pp
Remove /var/run/elasticsearch.pid during service shut downs
Run redeploy more often on qa1
Add comma :(
Fix find command for delete
Bump dse version to 3.2.5-1