clean up a bunch of things
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/scala/services/Spitball.scala
	src/test/scala/SpitballCoreTests.scala
Combine measures onto one line