Removed bad uniques
Updated core_content table to ucm_content
Merge branch 'ucm' of https://github.com/davidhurley/joomla-cms into davidsbranch
Added type_id to contentitem_tag_map
Merge branch 'ucm' of https://github.com/davidhurley/joomla-cms into davidsbranch
Work on updating component tables