Clean up yaro and collectData

Yaro was missing some swap counts. collectData now generates the
data ranges correctly using multiplication as opposed to the
crazy exponentiation stuff going on before.
Clean up the all-sorter-test file
No more enum!

We don't use enum anymore so pypy and the school computers
can now be used and abused.