Merge pull request #276 from ljo/develop

Fixing URLs to configuration and documentation in conf.xml.tmpl.