Added caching to find-file-in-project.
Added emacs-testify

Conflicts:

	init.el
Merge remote-tracking branch 'origin/master' into yelp

* origin/master:
  Added emacs-testify
  Added caching to find-file-in-project.

Conflicts:
	init.el