Revert "Revert "Remove settings that are now defined in sbt-web""

This reverts commit 2df94c9f7fcbe3ed07da5841b350abf154df3878.
Incorporated changes to the webjar-extractor where the module id is now included.

Also some tidy-up stuff.