Merge AMPLab changes

This version of AMPLab master is passing all unit tests.  Same for the merged code for me locally.  Occasionally the "interacting with files" test in spark.repl.ReplSuite will hang for both the baseline AMPLAb code and our master-csd, but I haven't yet figured out why.