Feature/merge tag

Converted to lower-case and merging where tags duplicate.
Should we add a comment here?

And the entry in setup.py?