tools, aliases, functions, oh my
Merge remote-tracking branch 'origin/osx' into osx

Conflicts:
	.gitmodules
override cd????
Merge remote-tracking branch 'origin/osx' into osx
Sooo many updates AHHHHHHHHHH
meh
Merge branch 'osx' of github.com:pferdefleisch/dotfiles into osx

Conflicts:
	.zshrc
UPTODATE WITH OSX