Consistent naming of Augmenter function templates and segments - fixes #62
Merge pull request #63 from rhunwicks/issues/62

Consistent naming of Augmenter function templates and segments - fixes #62