Fixed incorrect merge with #126 breaking sbt assembly for demos.