Issue: #1300, pyramid versiona and scaffold docs, add correct handling for dev docs which now points to 'master' docs