Update build process based on Spark changes

This updates the way that spark builds. This should be backwards compatible with older spark releases.