Use file-cache-add-directory-recursively instead of add-directory
Merge branch 'master' of https://github.com/domtronn/emacs

Conflicts:
	emacs.packages/ac-comphist.dat