sub org fixes

• fix mulitple parent org logo display with varying logo heights (i.e. mod and home office)
• move content_tag h1 inside unless sub-org as is always emtpy for sub orgs
• update sub org h2 to h1

https://www.pivotaltracker.com/story/show/49871461