updated docs and fixed printing of config
first implementation of blended n-grams
minor fixes
fixes typical tfidf recursion problem, AGAIN
added two short command line options
merge with master
merge with master