config tweaks
Merge branch 'master' of github.com:ilja/dotfiles

Conflicts:
	gitconfig
	zshrc