Changed all M's for num_inducing
Fixed merge conflicts, M now num_inducing
Merge branch 'devel' of github.com:SheffieldML/GPy into devel