Gh 1046

@bendk, @ehazlett, tested this locally as well as did some x-browser testing against gh-1046.amara.org. 

The only think that still concerns me is the icons, as we don't really know how they are going to look, nor can we really control it.  I made ticket #1122 to allow teams to upload smaller logos, but I think it's better if we do that work separately.  In order to get this to production, would it be possible to make it use only the default icon for teams (make sure there is no re-sized 48x48 option) with the exception of the erb team who had specifically requested that we have the ability to include a logo on the videos page, and who also has an existing image that looks good when resized.