Cleaning up following branch merge.
Merge branch 'dev'

Conflicts:
	.gitignore
	quanteda.pdf