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

Conflicts:
	zshrc