Remove theme folder, sensible name for content CSS
So, some other things needed to be changed for this to work
Merge branch 'master' into css-file-reorg
Fix assets.scala
Merge pull request #6589 from guardian/css-file-reorg

Remove theme folder, sensible name for content CSS