Cleanup sass

Just consolidated and cleaned up some stuff. I'm sure there is a LOT more to go.