Added missing textobj-user
Merge branch 'master' into laptop