remove custom-set-stuff
move the xivo-client include path to its own dir-locals file