Added macroses for ssh, scp, added waitfor for tomcat starting