Final classifier updates

Split classifier into two versions. Ngram version is the official one,
but left the perceptron one to show we tried it. The ngram one is
commented, etc. - I think we can finalize this
Merge remote-tracking branch 'origin/master'

Conflicts:
	classifier.py