Merge pull request #1 from halotools/develop

Update from main repo
Cosmology now uses astropy cache dir
Merge pull request #29 from BenediktDiemer/develop

Integrating cosmocode into halotools