Revision for remerge

Contains the SCSS cleanup, and should have the latest of bug fixes in it.