Post-release updates to dev guide
Merge pull request #243 from rwhitley/master

Post-release updates to dev guide
Merge remote-tracking branch 'origin/master' into unstable_merge
Merge pull request #244 from khawkins/unstable_merge

Merging master back to unstable