Syncing over OS X dotfiles from master branch. Will be using master branch for desktop OS X