Merge changes.
Overwrite my changes with James's.
Need to commit to resolve a conflict ...
Merge branch 'devel' of https://github.com/SheffieldML/GPy into devel