Resync

Add a new "resync" command that pulls, merge, and rebases from upstream then syncs the current branch.