Updates to style (they're bad)
Merge branch 'master' into stub-styles
Updates to desktop header
Merge branch 'master' of github.com:lincolnloop/LightningTalksLive