Backport Emacs 24.4's toggle-frame-fullscreen
Shrink ERC notices like joins, leaves, etc.
Switch to magit's master branch

There are a lot of nice features here that were not on the maint branch.
Don't word wrap following single-letter words
Merge branch 'origin/master'