Merge pull request #19 from ARTFL-Project/master

Update downstream
Merge pull request #105 from rwhaling/master

2nd attempt to caclulate cache hitlist size.
Merge pull request #20 from ARTFL-Project/master

Update downstream
bug fixes
Merge pull request #106 from clovis/master

Update upstream
Merge pull request #11 from ARTFL-Project/master

merge downstream