Starting to clean up the map
Merge branch 'master' of github.com:csviz/csviz