updates
Merge branch 'master' of ssh://github.com/schuppo/dotfiles

Conflicts:
	zsh/zshrc.symlink