Also add scipy. Cleanup commit slightly for formatting. Removing mkl allows this to be built in Hydra (mkl = unfree), and it seems the mkl dependency is somewhat optional given downstream packages build cleanly when removing mkl.
Oxford Splitting QP solver. Dependency for cvxpy -> qiskit-aer.