Merge branch 'master' of https://github.com/jskda/nltk into counter
remove caching and rewrite Nr code
merge stevenbird/fdist
replaced freqdist.inc(x) with freqdist[x] += 1
fix error in previous commit
merging changes from https://github.com/jskda/nltk/commit/7f8a67113909da5fcc7323a2902343e5480ade7d but preserving Nr instead of nr
incorporating more suggestions from https://github.com/nltk/nltk/pull/544
Merge branch 'master' of https://github.com/nltk/nltk into fdist
apply fixes from https://github.com/jskda/nltk/commit/9e41f5286ae99e66f054118fef6213c820b2ce1d
more helpful diagnostics
took heatherleaf's suggestion to calculate Nr faster
removed katz cutoff demo since it's no longer implemented by the SimpleGoodTuringProbDist class, cf https://github.com/nltk/nltk/pull/544
fixed probability distribution sum calculation bug in ProbDistI.generate()
added SUM_TO_ONE=False to SimpleGoodTuringProbDist as the sample probabilities do not sum to one
Merge pull request #551 from jskda/fdist

Fixes to fdist so the demo works.
Merge branch 'fdist'