Big changes (good, I hope)

Imported a bunch of config stuff I found. Hopefully I can wrangle it all
into something that works.