Combine CSS media queries
Merge pull request #442 from scrollback/gulpfixes

Combine CSS media queries
Merge branch 'master' into smallfix