Fix code standards

Fix inconsistencies in .scss files to better match the WP CSS coding standards.
Until WP agrees a SCSS standard, this is the closest ting we have to all
being consistent.
Fix merge conflict
Fix code standards

Fix merge conflict
Merge pull request #6 from GaryJones/feature/code-standards

Fix code standards