Add z and colorful-cat with pygmentize
Merge branch 'master' into knewton