Merge pull request #20 from rzo1/dep-updates

Updates several 3rd party dependencies (Tomcat, Johnzon, etc)