added support for tagging
Merge branch 'tags' of https://github.com/JonasSamuelsson/fixie into tags