fix syntax error in sql of multi key joins
Merge branch 'bmyerz/refactor-templates' of github.com:uwescience/raco into bmyerz/refactor-templates