profiling stuff
Merge branch 'master' of git://github.com/mattjj/pybasicbayes

Conflicts:
	internals/labels.py
	models.py
add counts arg to Categorical.resample
Merge branch 'master' of git://github.com/mattjj/pybasicbayes