updated
Merge branch 'master' of https://github.com/tacahilo/blog

Conflicts:
	_drafts/2014-09-18-puppet-yumrepo.md
Merge branch 'master' of https://github.com/tacahilo/blog