Update retul command
Add sevim and vim grep setting
Merge branch 'master' into lab-machines