Removed OS-specific settings
Merge branch 'master' of https://github.com/zgrannan/dotfiles
Updated gitconfig