Double quote deleted
Missing file, import line commented
Merge branch 'params' of github.com:SheffieldML/GPy into params

Conflicts:
	GPy/kern/_src/kern.py