Fix a bad merge of settings.el
Fix .gitmodules to find the right version of quilt

It needs my topic/run-in-dired branch.