Improved git diff config
Updated .gitconfig and .gitignore