Merge branch 'gak2'

Conflicts:
	themes/gak.zsh-theme
Merge remote-tracking branch 'gak/master' into gak