Final cut of newer GA WMS/WFS services.

This build uses clustering of markers and has disabled WMS support as the markers provide a better experience and are more interactive.