Revert "Merge branch 'bacon' of github.com:guardian/frontend into bacon"

This reverts commit f27b8877491c7c3fd2afd028c1ea31fc101fe1fc, reversing
changes made to 5373266033a9ca2074940f67ef4740c31b7f3c76.
Remove image column styling
Fix merge conflict
Fix inline image styling
Fix merge conflicts
More inline-image fixes