Tweaking over the weekend
Merge branch 'emerson' of https://github.com/pbailis/spark into emerson