Shufted more stuff around
Stuff compiles
Some tests pass again!
Merge remote-tracking branch 'origin/master'

Conflicts:
	project/Build.scala