Limit color palette
Get rid of hard-coded colors
Merge with master
Fix merge issues
Merge pull request #37 from dimagi/standardize-colors

Standardize colors