changed $header-font-weight to show actual default value
fixed merge conflict
Merge pull request #4469 from serquhart/correct-header-size-default

Correct header size default