Tighen up file selection during template importing for #794.
Merge branch 'master' of github.com:concerto/concerto