ffip dir added, sr-speedbar rendered harmless in latest emacs
Merge remote-tracking branch 'origin/master'

Conflicts:
	custom.el