Merge macosx dotfiles and Linux dotfiles