Neutrino Factory and Beta Beam Experiments and Development