Removed confirmation message from git-update.
Changed all hard-coding of 'master' to constant value. Also made minor fix regarding pulling from master during merge.