Add .osx file to customize Mac OS X preferences

Inspired by http://mths.be/osx
Add gitconfig

Inspired by https://github.com/MattiSG/DotFiles/blob/master/dots/gitconfig
Resolve conflict