Add puppet type to ack
Merge branch 'master' of https://github.com/marekkalnik/dotfiles

Conflicts:
	ackrc