split templates for different image types
Merge pull request #414 from travis-ci/sf-split-templates

split templates for different image types