git-wip: Use "$ext" instead of "$curr.ext" if we're on master

Don't want branch names like "master.wip".

2d6af60e-4466-11e4-9f4f-c80aa9e67bbd