Cafea files
elpy
Merge branch 'master' of github.com:bmc/elisp

Conflicts:
	startup.elc