Conflicts: src/scala/spark/HdfsFile.scala src/scala/spark/NexusScheduler.scala src/test/spark/repl/ReplSuite.scala
This also means that parallel arrays now get all the functionality files used to have (filter, map, reduce, cache, etc).