Remove puppet-mode since it's installed as a package now
Some new elpa stuff
Auto cpp-mode.
Better to comment or uncomment in one binding than remember two.
squashme