Ignore .tag, .tags, .tags_sorted_by_file

There're all auto-generated by Sublime text CTags plugin
Merge remote-tracking branch 'origin/master'

Conflicts:
	gitignore_global