Fixed some broken imports (likelihoods has moved), remember to tell everyone to delete their pyc file

GPy/models/generalized_FITC.py

@@ -10,8 +10,8 @@ from ..core import model
 from ..util.linalg import pdinv,mdot
 from ..util.plot import gpplot
 #from ..inference.Expectation_Propagation import FITC
-from ..inference.EP import FITC
-from ..inference.likelihoods import likelihood,probit
+from ..likelihoods.EP import FITC
+from ..likelihoods import likelihood,probit
 
 class generalized_FITC(model):
     def __init__(self,X,likelihood,kernel=None,inducing=10,epsilon_ep=1e-3,powerep=[1.,1.]):

GPy/models/uncollapsed_sparse_GP.py

@@ -6,7 +6,7 @@ import pylab as pb
 from ..util.linalg import mdot, jitchol, chol_inv, pdinv
 from ..util.plot import gpplot
 from .. import kern
-from ..inference.likelihoods import likelihood
+from ..likelihoods import likelihood
 from sparse_GP_regression import sparse_GP_regression
 
 class uncollapsed_sparse_GP(sparse_GP_regression):
@@ -136,8 +136,8 @@ class uncollapsed_sparse_GP(sparse_GP_regression):
         #dL_dm = np.dot(self.Kmmi,self.psi1V) - np.dot(self.Lambda,self.q_u_mean)
         dL_dm = np.dot(self.Kmmi,self.psi1V) - self.q_u_canonical[0]
 
-        #dL_dSim = 
-        #dL_dmhSi = 
+        #dL_dSim =
+        #dL_dmhSi =
 
         return np.hstack((dL_dm.flatten(),dL_dmmT_S.flatten()))  # natgrad only, grad TODO