Bring back vimdiff
Some updates
Use gls and set ulimit