Add vim-less and other niceties.
Merge remote-tracking branch 'origin/master'