Synchronizing nginx config with new caching rules for HTML pages
Fixed puppet runs on the puppetmaster node.
Merge pull request #14 from mrvisser/issue-14

Caching of resources that are not rehashed across UI changes
Pulling in etherpad 1.2.91.
Etherpad is now reachable via /etherpad/0