add java and tomcat
Merge branch 'master' of https://github.com/meruvian/vagrant-puppet