Deal properly with tags.
Merge branch 'master' of github.com:climatewarrior/p2p-app-backend