Emacs and shell stuff.
Remove custom again.
Merge remote-tracking branch 'origin/master'