Expand templates

From Rsyncrypto - Rsync Friendly Encryption
Expand templates