.gitconfig; remove status.short and status.branch

The implementations were buggy, and have been reverted.