remove special case for dev branches

the way pyramid's RTD works is that doc changes are rendered
automatically on each release branch, so dev versions should actually
point at their parent branch for the most up-to-date docs
Merge branch 'pull.1300'
add correct handling for dev docs which now points to 'master' docs