Fix for subbing None templates. Happens when e.g. a test-data directory is not available.
Merge pull request #20 from blankenberg/master

Fix for subbing None templates. Happens when e.g. a test-data directory cannot be found.