bump:git fix

Use + instead of - to separate git info. Replace existing git info if
present. Don’t concat gitVersion on multiple files.
Merge branch 'bump_git_fix' of https://github.com/kimberlycoy/grunt-bump