Merging branch/2013-05-17/emergency with major rework of MVT, MVFF, and CBS.
Some parts of this are still ragged, and would not normally pass review, but this is a massive improvement to the existing code.