conditional changes for carnegie theme
Merge pull request #1007 from edx/giulio/carnegie-theme

Conditional Carnegie theme changes