Updating to latest DataStax 2.x branch