Add color.js for color data.

- Some Refactoring on Map.js
- Also the marker.setMap was being used couple times in some cases. Fixed that
Add color.js to the models for color data.

- Refactoring on Map.js
- Fix some formatting and indentation issues
- Fix merge conflicts on Map.js and unit_tests.js
Merge branch 'master' into 'map-clean-up-and-check'
Fix a small indenting issue in test comments
Merge pull request #6 from ahotz/map-clean-up-and-check

Add color.js for color data.