Upgrade sbt assembly plugin. Clean up