Add zIndex to markers

I also had to change leaflet marker icon code as this was not working
for custom icons, it also allows easier customization of other leaflet
options if necessary
Set leaflet map type to mxn.Mapstraction.SATELLITE if HYBRID specified

Use Satellite tiles for Hybrid rather than throwing an error (makes
swapping between providers much easier)