Merge pull request #258 from themiurgo/master

Make features accessible from root

Author: ocefpaf

folium/__init__.py

@@ -3,4 +3,10 @@
 
 __version__ = '0.2.0.dev'
 
-from folium.folium import Map, initialize_notebook
+from folium.folium import Map, initialize_notebook, CircleMarker
+
+from folium.map import FeatureGroup, FitBounds,Icon, LayerControl, Marker, Popup, TileLayer
+
+from folium.features import (ClickForMarker, ColorScale, CustomIcon, DivIcon, GeoJson, GeoJsonStyle,
+    ImageOverlay, LatLngPopup, MarkerCluster, MultiPolyLine, PolyLine,
+    RegularPolygonMarker, TopoJson, Vega, WmsTileLayer)