Misc. edits during meeting with Jim and Matt, part 3
Merge remote-tracking branch 'origin/master'