Color markers

This PR rebases @birdage `color_markers` branch against latest @wrobstory folium.  I tested github comparison against `wrobstory:master` and this will return a green button for https://github.com/wrobstory/folium/pull/42.  If you need any help, or if you want me to send this PR to @wrobstory let me know.