Merge pull request #1 from phowland1/dev

Dev
Merge pull request #2 from phowland1/peter-dev

Peter dev
Adding Tomcat Plugin for easy deploy
Merge pull request #18 from andyjwest/master

Adding Tomcat plugin