upgrade scala
checkin org in build sbt
Merge remote-tracking branch 'remotes/jasongoodwin/master'

Conflicts:
	build.sbt
	src/main/scala/com/gravity/goose/Configuration.scala
Merge branch 'master' of https://github.com/raisercostin/goose