Squashed commit of the following:

commit c3c8c557bc8703c021047026159df7b412b32aa7
Author: Roger Hughes <dart020@gmail.com>
Date:   Fri Mar 29 15:42:00 2013 -0400

    Remove tag-related items