Season tags... again

much nicer markup and nicer less `.tag` mixin.

I'm incompetent with git, so all my pull requests annoyingly have pep-8 stuff and some commits from chris somehow as part of them.