bump version
only change scalaVersion and unmanagedSourceDirectories when it's a plugin
Merge commit 'pull/15'
Merge branch 'master' of github.com:jrudolph/sbt-cross-building

Conflicts:
	project/plugins.sbt