update etherpad stuff
Merge branch 'master' of github.com:OpenWatch/chef-repo