continued factoring of blocking.py
major bug fix in how training data is shuffled in cross validation
Merge branch 'master' into dev