Add Rob Whitehead's contact information to the roster.
Fix merge conflicts