Merge branch 'master', remote branch 'origin'
Change to point duncombe-noaa urls in the right place.