added puppet syntax highlighting
HARD MODE!
merge commit