Color and icon markers for folium simple markers

updates the folium markers to allow for `marker_color` and `marker_icon`
colors are specified as text i.e `green`,`red`,`orange`
icons are specified according to [bootstrap glyphicon icons](http://getbootstrap.com/components/) as text i.e `star`,`home`,`info-sign`,`ok`

tested in ipython notebook and works