Remove the .osx file, change order of local path
Merge branch 'master' of github.com:chrishenry/dotfiles