I think that takes care of it; let me know if I missed anything.
Found a mistake in install-tomcat.sh while I was doing this:
--build-dir=DIR path to Whirr dist.dir
--prefix=PREFIX path to install into
--doc-dir=DIR path to install docs into [/usr/share/doc/whirr]
--lib-dir=DIR path to install Whirr home [/usr/lib/whirr]
Will open a separate ticket to fix these whirrs to bigtop-tomcats.