Don't break if already on master branch in translation-update-git-masterfile task
Use new 'merge' parameter in text collection
BUG Push new masterfile to translation-staging origin

Rather than resetting the branch on subsequent tasks
through translation-setup
Don't detect changes in untracked files

It'll cause the "git commit" calls to fail