Add java and jetty. Refactor vm definitions along with machine names and IPs