Change emmet-yasnippet binding yet again
Install puppet-mode from MELPA

I actually did this last night, but forgot to commit.