Changes to compile Shark with Spark 0.7 (streaming)