minor changes
flags added
Merge branch 'devel' of github.com:SheffieldML/GPy into devel
EP is back.