Added some markers to the SASS partials so they can be located more easily in compiled CSS

Plus a few minor formatting changes