Try and re-enable Numpy 1.5 and Matplotlib 1.2