added rubygems path
merge
Merge branch 'master' of https://github.com/requalix/terraform

Conflicts:
	.zshrc