clearstorydata/shark — pull request #24 by markhamstra (2013-07-03 18:23:06+00:00)
Title: Rebased to AMPLab master

Reverted troublesome SHARK-92 commit; still working with Reynold to determine whether this is his problem or our's.