A bunch of small fixes.
Merge remote-tracking branch 'origin/master' into yelp

Conflicts:
	elpa/find-file-in-project-3.2/find-file-in-project.el
	init.el
	lisp/emacs-testify
Merge remote-tracking branch 'origin/yelp' into yelp

Conflicts:
	init.el