Update Cilantro to 2.2.6 and refactor to 2.2.6 templating
Merge pull request #95 from cbmi/issue-94

Update Cilantro to 2.2.6 and refactor to 2.2.6 templating