Merge from main site

I'm keeping the main site in the WhirlyGlobe repository, so this is a copy and then merge.