puppet validation
Merge branch 'master' of https://github.com/joschi03/dotfiles

Conflicts:
	.vimrc
	README.md