Merge pull request #26 from christopherbozeman/master

Added Spark 1.2.0 release, update for Spark branch-1.1 and branch-1.2 experimental builds
Merge remote-tracking branch 'upstream/master'