Merge branch 'devel' of github.com:SheffieldML/GPy into devel

GPy/inference/__init__.py

@@ -1,2 +1,3 @@
 import latent_function_inference
-import optimization
+import optimization
+import mcmc

GPy/inference/mcmc/hmc.py

@@ -1,4 +1,4 @@
-# ## Copyright (c) 2014, Zhenwen Dai
+# ## Copyright (c) 2014 Mu Niu, Zhenwen Dai and GPy Authors
 # Licensed under the BSD 3-clause license (see LICENSE.txt)
 
 import numpy as np

GPy/kern/__init__.py

@@ -13,6 +13,7 @@ from _src.ODE_UYC import ODE_UYC
 from _src.ODE_st import ODE_st
 from _src.ODE_t import ODE_t
 from _src.poly import Poly
+from _src.eq_ode2 import EQ_ODE2
 
 from _src.trunclinear import TruncLinear,TruncLinear_inf
 from _src.splitKern import SplitKern,DiffGenomeKern