Move setting to config/neo-config.el and tweak for newest changes in Emacs Live master