Organized sbt-stuff my way; updated direct dependencies (but still with old scala)
1.0.2
Merge branch 'master' of github.com:ohnosequences/nispero
Merge remote-tracking branch 'upstream/master'

Conflicts:
	version.sbt