Pull in upstream/master and fix conflicts#2

Merged

bwengals merged 12 commits intobwengals:find_MAP-float32from

kyleabeauchamp:mlefix

Aug 16, 2017

Commits on Aug 12, 2017

Remove debug import (#2498)

kyleabeauchamp
authored and
aseyboldt
committed
Add logp_nojac and logp_sum
aseyboldt
committed

Commits on Aug 14, 2017

Speed up test_distributions

aseyboldt
authored and
twiecki
committed
Call super().__init__ in pm.Factor

aseyboldt
authored and
twiecki
committed
Fix some whitespace issues in discrete.py

aseyboldt
authored and
twiecki
committed
Resolve conflicts
kyleabeauchamp
committed
latex fix for Flat and HalfFLat
Junpeng Lao
committed

Commits on Aug 16, 2017

Add logp_nojac and logp_sum (#2499)

aseyboldt
authored and
Junpeng Lao
committed
add stacking method to compute weights

aloctavodia
authored and
twiecki
committed
test compare

aloctavodia
authored and
twiecki
committed
Merge master
kyleabeauchamp
committed
Fix
kyleabeauchamp
committed