Fix counting
Merge branch 'master' of github.com:jmccrae/nimrod

Conflicts:
	scripts/simple-phrase-extractor.scala