working on delta sigma code
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #29 from BenediktDiemer/develop

Integrating cosmocode into halotools
Merge pull request #30 from BenediktDiemer/develop

Generalized concentration module
Merge remote-tracking branch 'upstream/develop' into develop
small chnages
added sparse distance matrix calculation into tree
adding perpindicular/parallel projected distance calculation.  not sure if PBCs are handled correctly here...
added kdtree code to do jacknife calc, some tests dont work
Merge pull request #33 from duncandc/develop

Develop
Merge pull request #2 from halotools/develop

Develop