Minor updates
Merge branch 'master' of https://github.com/rcano/nbscala

Conflicts:
	libs.local/pom.xml