Requesting a pull to mozillafordevelopment:master from k88hudson:42

Cool for now, but let's start moving color definitions into a `colors.less` file soon.