add a test for server watching templates
track changes to extendeed templates in server
Merge branch 'master' of github.com:RichardOfWard/discharge

Conflicts:
	tests/test_0003_plugin_jinja2_templates.py