Updated scala versions, cleaned up dependencies.
Fixed NPE.