refactor colorCommentScore presets
stop gifv expandos overlapping content (take 2)
Merge pull request #1842 from erikdesjardins/fix-fixes

Fix gifv expandos overlapping content (again), and refactor one of my changes