Updates for bleeding edge emacs and commenting out rainbow delims.