A bunch of messy code that seems to work!
SideViews are no longer responsible for marking.
Specs for the ConflictMarker.
Apply a class to resolved lines, too.
Refactor some common bits out.
Remove a bunch of code that's no longer needed.