specify git helpers
use extended_glob in zsh
add sublime text 3 files
Merge branch 'master' into gh

Conflicts:
	gitconfig
	init.sh