vim: enable cursor line
Merge branch 'master' into ubuntu