Evolution of the bulk properties, structure, magnetic order, and superconductivity with Ni doping in CaFe 2-x Ni x As 2