Bit of a tidy-up in SCSS land. Include all into a single file.
Remove inline (debug) comments.