updated to handle uberjar and uberwar packaging better