Make magit use the correct emacsclient
Re-enable yaml-mode