Version bump
Merge branch 'master' of github.com:milo000/milo000-overlay

Conflicts:
	dev-java/sbt-bin/sbt-bin-0.12.2.ebuild