Rolled back bad merge; push fix for #311
Merge branch 'pymc3' of github.com:pymc-devs/pymc into pymc3