Git tells me to commit before I can merge in Greg's changes
Merge with some more minor changes.