Local changes
Merge branch 'master' of https://github.com/kolotyluk/scala-script-utilities

Conflicts:
	.cache
	src/main/java/net/kolotyluk/scala/script/Setup.java