Merge pull request #63 from prometheus/sparsehistogram

Merge sparsehistogram branch into master