Dependency updates + changes for Spark 1.2.0

Closes #2