Updated gitconfig and conky