Merged with .osx file from Mathias dotfiles