Equal-width and Chi-merge discretisation
Merge pull request #29 from Sentimentron/discretisation-upstream

Equal-width and Chi-merge discretisation