refactor functions

	now set_remote_repo handles origin or upstream
	merge_upstream is simplified

Changes to be committed:

	modified:   lib/git.lib