Add groovy, luajit; update tomcat 7