working refactor
Merge branch 'emerson_refactored' of https://github.com/pbailis/spark into emerson_refactored
fixing a bug
Merge branch 'emerson_refactored' of https://github.com/pbailis/spark into emerson_refactored
minor reformatting