removed orig and log files
added orig and log files to gitignore
stopped p4merge from keeping backup files