vim: modify colors
Merge branch 'master' into ubuntu
vim: update fold colors
Merge branch 'master' into ubuntu