Updated script to generate tags
merge conflicts tag-emacs.sh

Conflicts:
	notmuch-tagging.sh
	tags-emacs.sh
Merge branch 'master' of https://github.com/makp/scripts

Conflicts:
	tags-emacs.sh