More post merge cleanup
gitignore now correct

Merge branch 'dev'

Conflicts:
	.gitignore
trying to fix mess from merge

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

Conflicts:
	.gitignore