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

Conflicts:
	.gitmodules