Merge branch 'master' of git.atlas.oreilly.com:schacon/progit2

Author: Sanders Kleinfeld

atlas.json

@@ -40,7 +40,7 @@
         "fonts/hold/UbuntuMono-Regular.otf",
         "fonts/hold/UbuntuMono-Italic.otf"
       ],
-      "syntaxhighlighting": false,
+      "syntaxhighlighting": true,
       "show_comments": false
     },
     "mobi": {
@@ -54,18 +54,18 @@
         "fonts/hold/UbuntuMono-Regular.otf",
         "fonts/hold/UbuntuMono-Italic.otf"
       ],
-      "syntaxhighlighting": false,
+      "syntaxhighlighting": true,
       "show_comments": false
     },
     "html": {
       "index": true,
       "toc": true,
-      "syntaxhighlighting": false,
+      "syntaxhighlighting": true,
       "show_comments": false,
       "consolidate": false,
       "consolidated": false
     }
   },
   "theme": "oreillymedia/atlas_tech1c_theme",
   "title": "Pro Git"
-}
+}