Edits
Merge branch 'master' of github.com:arfon/tagmap