Spark 1.1.0
Avoid Guava version problems by not using Stopwatch(), which appeared and disappeared over a few versions
Avoid minor annotation API jar conflict
Merge branch 'master' into suneel