Cleaned up logging and war jar

Logging config should get picked up now. Also ensured the WAR was not unpacked
when building the WAR-in-a-JAR.