Use vim-sensible and other defaults.
Merge branch 'master' into x201