new puppet highlight
Merge branch 'master' of github.com:eshrubs/home

Conflicts:
	zshrc