Add code hilite by default (use pygments).
Merge origin/master