scala 2.11.4, updated libraries, cleanups