added folium
Merge branch 'master' of github.com:ioos/conda-recipes