Back to vim
Updated diff commands for better output