Add Genshi template rendering
Add filter type to state_output
Oof, forgot to clean up copy/paste
Merge pull request #14684 from techhat/outputfilter

Add filter type to state_output
Add filter type to state_output
Backport #14684 to 2014.7
Merge branch '2014.7' into develop
Merge pull request #14680 from techhat/genshi

Add Genshi template rendering
Revert "prevent gitfs.py changing load variable that is used by other fs modules too"

This reverts commit 852571056e49667698a2f34cf9588519b03a0074. See
https://github.com/saltstack/salt/pull/14594#issuecomment-50952929 for
more info.
Merge branch '2014.7' into develop
Adding Template renderer for Cheetah
Merge pull request #14692 from techhat/cheetah

Adding Template renderer for Cheetah
Corrected typo (Verion → Version).