add hsmm-geo example, update pybasicbayes
Merge branch 'dev2' of github.com:mattjj/pyhsmm into dev2

Conflicts:
	basic/pybasicbayes