Added the discussion rewrite rule to nginx.
Merge branch 'master' of git://github.com/sakaiproject/puppet-hilary

* 'master' of git://github.com/sakaiproject/puppet-hilary:
  Removing installed, file