Fix custom templates

This is a release candidate because I have not been able to test this feature. Please test it out with both template strings and template urls, and if they both work I will promote it to a full release. Thanks!