Unigrams.
Merge branch 'master' of https://github.com/eukaryota/maxent

Conflicts:
	run.py