Merged Austin Settings with Chris' Name Change

This is gonna be exciting.