Tagging

Merge in the work of @bmuscede and @nathanychow on the Tagging system.
Don't use parentheses around the condition of an `if`.