Probing non-unitary mixing and CP-violation at a Neutrino Factory