Merge pull request #3 from esheldon/master

upstream sync
Merge pull request #4 from esheldon/master

upstream merge
Update joint_prior.py
Merge pull request #8 from beckermr/master

fixed stray import of esutil