Sass clean up

Lumping files back together. Deleting unused stuff.