Clean up isScratching logic a bit.  untested.
Merge remote-tracking branch 'origin/master' into ratecontrol-scratchfix
add override for new scratch2 behavior
flipped a bool
Merge branch 'master' into ratecontrol-scratchfix
Rename "isScratching" to be more accurate, which is that it reports that scratching is occurring.
Fix logic in calculateRate for circumstances where we use the scratch value but don't report it.
remove script hacks that disable keylock during scratching.
(There is some whitespace churn because of my text editor)
Remove manual keylock disabling from controllerengine braking macro.
renamed m_pScratchToggle to  m_pScratchEnable
Inverse  "scratch2_always_on" logic to "scratch2_scratching"
Disable parts of rate logic during waveform scratch
Merge pull request #3 from daschuer/ratecontrol-scratchfix

Ratecontrol scratchfix VC logic
Merge branch 'master' into ratecontrol-scratchfix
Merge branch 'master' into ratecontrol-scratchfix
slightly better name for this CO
Merge branch 'master' into ratecontrol-scratchfix
Change vinylcontrol to not use scratch2 for rate.

Instead, use a new internal CO called vinylcontrol_rate.
Merge branch '140515-vc-newco' into ratecontrol-scratchfix

Conflicts:
	src/engine/ratecontrol.cpp
clean up merge
Unify scratch2 variable names a bit.
Extract and explain rate constants.