Cleaned up some statistics-related stuff
Merge branch 'master' of github.com:cpitclaudel/6.830