Merge branch 'master' of https://github.com/xavifuefer/my-boxen

Conflicts:
	modules/people/manifests/xavifuefer/settings/dotfiles.pp
Merge branch 'master' of https://github.com/xavifuefer/my-boxen