--abort shouldn't modify any refs

When hitting a conflict while integrating, if you checkout another
branch before running "git integration --abort", then that branch will
be modified to point at the previous state of the integration branch.

Fix this by re-ordering the "point HEAD at my branch" and "reset HEAD to
the old state" steps.

Signed-off-by: John Keeping <john@keeping.me.uk>