Fixed template ID bug preventing certain templates from being used as a base for others
Merge branch 'master' of ssh://github.com/taguchimail/mimeformat.it