Update prepare_fork to be more inline with original prepare script
Improve comments and git flow
Merge branch 'develop'

* develop:
  Improve comments and git flow
  Update prepare_fork to be more inline with original prepare script