Getting ready for Kethane deprecation
Tons of config changes
Merge remote-tracking branch 'upstream/master'