fix bug and work on vimdiff.txt
ignore generated folder, small style update, vimdiff completed for now