Merge pull request #35 from rwhaling/master

merge upstream
help distinguish occurences from hits in concordance_from_collocation
Merge pull request #36 from clovis/master

Another fix
Merge pull request #7 from ARTFL-Project/master

merge downstream