OS X paths
Merge pull request #1 from JustinLove/osx

OS X paths