Changes to apprentice.vim.
Merge branch 'master' of github.com:romainl/dotvim