merging
Merge branch 'master' of https://github.com/pnulty/quanteda

Conflicts:
	R/classification.R