Merge pull request #3 from nltk/master

Merge updates from NLTK master