Sooo many updates AHHHHHHHHHH
meh
Merge branch 'osx' of github.com:pferdefleisch/dotfiles into osx

Conflicts:
	.zshrc