Add zipN and zipWithN for N in {3,4,5}
Merge branch 'master' into canonicalize
glShader => glsl in pretty printer
Correct parsing of listings