Bring pygments lexer up to date with upstream

These are largely stylistic changes