Merge branch 'master' of github.com:usmanity/dotfiles
renaming osx