ignore emacs tmp files;
change the displayed action when the action at the end of the path changes;
Merge branch 'master' into gh-pages

Conflicts:
	.gitignore