remove dependency on pyhsmm
Merge branch 'master' into paralleltempering

Conflicts:
	models.py