added tags, and tag cloud
Ran db:migrate.
Resolved conflicts from merging Gustavo's changes.  He added tagging.