vim: add syntax highlighting for puppet
Merge master into mac