spelling
some messing with fitc
Merge branch 'params' of github.com:SheffieldML/GPy into params
dumb merge conflict in a comment