dropping color out of color name
some active states and color changes
Merge pull request #320 from mapzen/ekta/visual-qa

Ekta/visual qa