Quick hack for Emacs 23 compatibility (mock prog-mode)
Merge branch 'master' of https://github.com/apchamberlain/puppet-mode