diff foreground fixes

magit seems to clobber my color theme colours for it
as does diff mode
Debugging this seemed to indicate that they were setting diff + and
diff - explicitly to red and green on load
Adding a require for each of these libraries to the top of the theme
and then setting the faces in the theme definition is a workaround
for this problem, but it smells like the wrong thing to be doing