Fix incorrect template being extended.
Merge pull request #52 from audreyr/template-fixes

Fix incorrect templates being extended.