oops, num motifs function returned a float
Merge remote-tracking branch 'upstream/master'

Conflicts:
	cmonkey/motif.py