Updates for IntelliJ 12 + hopefully more permanent Tomcat link