Updates to map to get the colors and popup tabs right
Merge remote-tracking branch 'remotes/upstream/master'
Missed this on the previous commit
Merge pull request #6 from nathanielroth/master

Bringing in the changes to the maps