tomcat 7.0.54

Closes #472.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
elasticsearch 1.1.2

Closes #476.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>