cleaning some stuff up
whoops, committed all during a sphinx install...