Trivial change to readme
Some minor modifications to HOD_Mock to improve transparency
Added velocity attributes to mock galaxies in HOD_Mock
Merge pull request #16 from aphearin/develop

Develop
Merge pull request #17 from surhudm/develop

Added spherically symmetric Jeans modelling
Added Surhud's jeans analysis module.
Modifying Surhud's docstrings to conform to package conventions
Yao's correlation function code
More modifications to jeans module docstrings
Merge pull request #18 from beckermr/develop

Yao's correlation function code
Merging my working copy with Matt Becker's recent pull request of Yao's CF code.

Merge remote-tracking branch 'upstream/develop' into develop
Changes to docstrings of jeans module
Added a new class in halo_occupation for Leauthaud HOD
Merge pull request #19 from alexieleauthaud/develop

Added a new class in halo_occupation for Leauthaud HOD
Minor changes to API of Zheng07 HOD
Merged Alexie's SMHM-based HOD into the halo_occupation module.

Merge remote-tracking branch 'upstream/develop' into develop
Alexie's SMHM HOD does not work when passed an array of halo masses.
The class runs just fine when passed a single halo mass,
but breaks when any of the methods are passed a numpy array of many halo masses.
The root of the problem appears to be the use of the brentq routine in scipy.
This routine apparently does not want to its optional args input
to be array. It's not immediately obvious how to get the correct
vectorized behavior.
Minor changes to docstrings in Leauthaud11 class
Merge pull request #20 from aphearin/develop

Develop
Beginning to code up conformity function