Better shell configuration for OS X
Merge