The Oakland City Council voted Wednesday to expand the number of permits for medical marijuana dispensaries, as well as bring delivery services, cultivation, manufacturing and related businesses out of the black market and into the regulatory sunlight.