Minor updates to the developer-guide.
Merge pull request #1235 from jmaas/master

Minor updates to the developer-guide.