Miscellaneous edits

Various miscellaneous edits I'd like someone (and Travis) to look over before they end up in GreenGroup/master. (No particular topic though, so don't need a merge commit).