vim: replace command-T with ctrlP
Merge branch 'master' into ubuntu