proper puppet support from [1]

[1] https://github.com/puppetlabs/puppet/tree/master/ext/vim/

What I had previously caused puppet syntax highlighting to be on
when a file was opened with no filetype.
Merge branch 'master' of github.com:cberzan/dotfiles