updates stats.py and Revert_and_branch.md to work nice with the testing module
Merge branch 'stats' into final-edits