Tidy up project.
Added clustered markers
Layer choser
Popups
Removed openlayers version of the page