Added discovery of template direcories from TEMPLATE_DIRS and INSTALLED_APPS
Added coverage, cleaned up settings override