Add fq_templates to TEMPLATE_DIRS in Makefile.in
Add some parentheses to shut up the compiler.
Merge remote-tracking branch 'mhansen/flint-2.4' into flint-2.4
Merge branch 'flint-2.4' into trunk