Remove Puppet-Syntax-Highlighting and add shortcut for buffer switching