Add ipython2 and hide it behind a version switch.

Would this work? Haven't investigated the "when" system very much...