initial commit
trying the github version modification
oops
changes for osx, should really move this to a env specific config
Merge branch 'master' of github.com:jouberthenk/dotfiles

Conflicts:
	setup.sh