Modified gitconfig
Merge branch 'develop' of github.com:aaleman/configs into develop