Merge branch 'single-cookie stylesheet switcher'
more thorough instructions for concatenating js