rip out remaining fork settings
rip out settings belonging in a fork
Merge remote-tracking branch 'upstream/master'