Cleaned up merge bugs

Fixed a bug with missing local branches. Branch abandonment no longer preserves history.