Added a helper script that navigates up a file hierarchy until it hits the .git folder.
Added a script for doing a --ff-only merge to the head of the upstream branch.