Added support for n-grams, refactored features extraction
Merge branch 'master' of https://github.com/lukedeo/cross-domain