Various config stuff

Scoots was here.

catch a rideeee
Merge remote-tracking branch 'origin/master'