Merge pull request #169 from tarsius/master

Add new color zenburn-bg+05 and use it to highlight current magit sections
[patch/revert] "Disable problematic defadvice"

This reverts commit 27cee3d6ccc586b4bc30fb322927a6d275e54c34.
[patch/revert] show-paren-*, sp-show-pair-mismatch-face

This reverts commit 38b3094dd0098de86bf972c933df76f13a1da981.
[patch/revert] font-lock-builtin-face

This partially reverts commit 26eb5433532efc86d86addb31e127e189c61df72.
[patch/local]  new colors zenburn-{black,white}
[patch/local]  "gui" faces
[patch/add]    highlight-symbol-face
use face names from magit's next branch