Combine conda installs to make sure correct numpy version is used
Add jinja2 to conda dependencies
Merge pull request #15 from mwcraig/add-jinja

Add jinja2