Updated git merge
Merge branch 'master' of github.com:smathieu/ci_utils

Conflicts:
	.zshrc
New scripts