polishing includes for combinatorial and modifying anp and cnp
merging master
improving scalar fibonacci
polishing combinatorial functors
polishing combinatorial and adding tests
Merge pull request #732 from jtlap/combinatorial_includes

Combinatorial includes