A few updates to intersphinx

After some discussion with @bmbouter, we decided that this patch is a better
way to go for managing which docs version each branch points to for intersphinx
linking.
Merge pull request #1321 from beav/intersphinx-update

A few updates to intersphinx