Changed HTML

Put HeaderContainer in LogoContainer to allow for an easy box-shadow
option.
Also cleaning up Sass variables and conditionals.