Clean up template deletion, close #395.
Merge branch 'master' of github.com:concerto/concerto