Added a bunch of fixes to scoring, I think? Also, pacemakers.
Merge branch 'master' of github.com:zardoru/raindrop

Conflicts:
	src/ScreenGameplay7K.cpp
Made some stabilizing changes, but it seems to have broken the build.