Add sbt-assembly
Merge branch 'scala-2.11.1'