janus_incomplete_template ==> janus_template, janus_template ==> janus_flat_template
Merge branch 'master' of https://github.com/biometrics/janus