merging in changes
Merge branch 'master' of https://github.com/abelsonlive/par_data
lots of shit
cleaning up