studio - sass cleanup: local merge with master and small comment/organization tweaks to variables and base-styles
