Merged tuning
Fixed trace bug in sample from bad merge
Merge branch 'random' into pymc3

Conflicts:
	pymc/sample.py