Pull from NLTK master into dougalg/nltk