Development of neutron electric dipole moment experiments at SNS and at Los Alamos