Add .dir-locals, more cleanup