namespace fixes
Conflict in namespace, will resolve soon

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