Formatting fix-ups
Merge pull request #1 from douggeiger/tags_wip

Formatting fix-ups