correctly closed link tags
reverted original changes and set highlighter to pygments
Merge remote-tracking branch 'upstream/master'