Reimplement options/context and fold in autoescape
Fold django abstract_* types into options
Cleanup
Fix library_loader
Merge branch 'master' of https://github.com/ajg/synth

Conflicts:
	ajg/synth/engines/django/builtin_tags.hpp
Fix base_binding
Cleanup
Eliminate heap allocation for templates
Expand comment