big changes
Merge branch 'porkchop' of https://github.com/pbailis/spark into porkchop
additional code cleanup