updated to use last two fields of branch name
removing dupl refactor (installed via setup.sh)
fixed git template config