--
Merge branch 'master' of github.com:epaull/TieDIE

Conflicts:
	lib/kernel_scipy.py