magit/magit 1 merged

• Merge the real branch into the wipref Aug 1

bbatsov/solarized-emacs 1 merged

• Do not derive outline faces from org faces Aug 7