Merge branch 'master' into adaptive

Conflicts:
	emcee/ptsampler.py