GPy/util/visualize.py: fixed conflict.
Merge branch 'devel' of github.com:SheffieldML/GPy into devel