Fix blacklist derp
Massive code whitespace/formatting adjustment
Merge remote-tracking branch 'upstream/1.7-update' into 1.7-update