Fix various fucking broken shit.  Because, awesome.  But still the
configuration test doesn't pass so fuck this shit.  It's friday and I'm
checking in.