Upgrade to Spark 1.1.1
Changed up the data model a bit to be less sterile.