cargo tomcat fixes
Merge pull request #6 from izreal/master

Fixes for Cargo plugin