Update bundler settings, set bundler to run no glob in zsh
Merge remote-tracking branch 'origin/master'

Conflicts:
	ruby/.bundle/config