add show-keys mode for presentation
Merge branch 'master' of github:AndreaCrotti/Emacs-configuration

Conflicts:
	.gitmodules