Update pygments file.
Add formatting for inline and block code.
Clean up garbage.
Merge branch 'master' into variant

God, I hope this works.