Merge pull request #39 from hudmol/tomcat-doc-update

Added a short guide for running under Tomcat [ci skip]
Merge pull request #38 from hudmol/clustering-doc-update

Note that Nginx's config file might be in a different spot on some distributions [ci skip]