Merge pull request #4093 from adbridge/update

Update.py: New feature - update a branch instead of a fork, plus general improvements.

Author: theotherjimmy